Proper merge for gitignore

[rbdr/super-polarity] / Super Polarity Content / Super Polarity ContentContent / Super Polarity ContentContent.contentproj

diff --git a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj
index 4e7a9f0227496c99e97c47b196adbebc6f3fbd37..12417a22fe8f56a0a8913033223b6bf93c3582b7 100644 (file)
--- a/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj
+++ b/Super Polarity Content/Super Polarity ContentContent/Super Polarity ContentContent.contentproj
@@ -110,7 +110,11 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
     </Compile>
   </ItemGroup>
   <ItemGroup>

-    <Folder Include="Sound\" />
+    <Compile Include="Graphics\pause-screen.png">
+      <Name>pause-screen</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>

   </ItemGroup>
   <ItemGroup>
     <Compile Include="Graphics\circle.png">
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Graphics\circle.png">


@@ -129,6 +133,53 @@
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>
       <Processor>TextureProcessor</Processor>
     </Compile>
   </ItemGroup>

+  <ItemGroup>
+    <Compile Include="Graphics\negative-ship.png">
+      <Name>negative-ship</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Graphics\square.png">
+      <Name>square</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Fonts\SegoeUIMono14.spritefont">
+      <Name>SegoeUIMono14</Name>
+      <Importer>FontDescriptionImporter</Importer>
+      <Processor>FontDescriptionProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Sound\polaritytheme.wav">
+      <Name>polaritytheme</Name>
+      <Importer>WavImporter</Importer>
+      <Processor>SongProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Graphics\polaritydemotitle.png">
+      <Name>polaritydemotitle</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Fonts\bigfont.png">
+      <Name>bigfont</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>FontTextureProcessor</Processor>
+    </Compile>
+    <Compile Include="Fonts\smallfont.png">
+      <Name>smallfont</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>FontTextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>

   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it. 
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--
       To modify your build process, add your task inside one of the targets below and uncomment it.